to resolve a conflict - German English Dictionary